Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #90347

Merged
merged 16 commits into from
Oct 27, 2021
Merged

Rollup of 5 pull requests #90347

merged 16 commits into from
Oct 27, 2021

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

EliseZeroTwo and others added 16 commits October 25, 2021 17:31
…id getting inconsistent output between local and CI.
Consistent big O notation in map.rs

Follow up to rust-lang#89216
…id_attrs_ice, r=Aaron1011

fix: inner attribute followed by outer attribute causing ICE

Fixes rust-lang#87936, rust-lang#88938, and rust-lang#89971.

This removes the assertion that validates that there are no outer attributes following inner attributes. Where the inner attribute is invalid you get an actual error.
…vidtwco

Add hint for people missing `TryFrom`, `TryInto`, `FromIterator` import pre-2021

Adds a hint anytime a `TryFrom`, `TryInto`, `FromIterator` import is suggested noting that these traits are automatically imported in Edition 2021.
…ecked, r=Mark-Simulacrum

Add tracking issue number to const_cstr_unchecked

Also created a tracking issue, see rust-lang#90343.

I think it makes sense to stabilize this somewhat soon considering abuse of `transmute` to have this feature in constants, see https://crates.io/crates/cstr for an example. Code can be rewritten to use `mem::transmute` to work on stable.
@rustbot rustbot added the rollup A PR which is a rollup label Oct 27, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Oct 27, 2021

📌 Commit 623c3e1 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 27, 2021
@bors
Copy link
Contributor

bors commented Oct 27, 2021

⌛ Testing commit 623c3e1 with merge 4e0d397...

@bors
Copy link
Contributor

bors commented Oct 27, 2021

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4e0d397 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 27, 2021
@bors bors merged commit 4e0d397 into rust-lang:master Oct 27, 2021
@rustbot rustbot added this to the 1.58.0 milestone Oct 27, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4e0d397): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@matthiaskrgr matthiaskrgr deleted the rollup-rp2ms7j branch November 20, 2021 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants